Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix accidental overwriting of LDAP team memberships #24050

Merged
merged 2 commits into from
Apr 11, 2023

Conversation

sillyguodong
Copy link
Contributor

@sillyguodong sillyguodong commented Apr 11, 2023

In the for loop, the value of membershipsToAdd[org] and membershipsToRemove[org] is a slice that should be appended instead of overwritten.
Due to the current overwrite, the LDAP group sync only matches the last group at the moment.

Example reproduction

  • an LDAP user is both a member of cn=admin_staff,ou=people,dc=planetexpress,dc=com and cn=ship_crew,ou=people,dc=planetexpress,dc=com.
  • configuration of Map LDAP groups to Organization teams in Authentication Sources:
{
    "cn=admin_staff,ou=people,dc=planetexpress,dc=com":{
        "test_organization":[
            "admin_staff",
            "test_add"
        ]
    },
    "cn=ship_crew,ou=people,dc=planetexpress,dc=com":{
        "test_organization":[
            "ship_crew"
        ]
}
  • start Synchronize external user data task in the Dashboard.
  • the user was only added for the team test_organization.ship_crew

@sillyguodong sillyguodong changed the title Fix wrong overwite in func resolveMappedMemberships Fix wrong overwite slice in func resolveMappedMemberships Apr 11, 2023
@yardenshoham yardenshoham added this to the 1.20.0 milestone Apr 11, 2023
@codecov-commenter

This comment was marked as off-topic.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 11, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 11, 2023
@delvh delvh changed the title Fix wrong overwite slice in func resolveMappedMemberships Fix accidental overwrite of teams across authentication sources Apr 11, 2023
@delvh delvh changed the title Fix accidental overwrite of teams across authentication sources Fix accidental overwriting of LDAP team memberships Apr 11, 2023
@delvh
Copy link
Member

delvh commented Apr 11, 2023

Backport?

@sillyguodong
Copy link
Contributor Author

Backport?

I think it should be backported.

@delvh delvh added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Apr 11, 2023
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 11, 2023
@delvh delvh added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
@delvh delvh enabled auto-merge (squash) April 11, 2023 22:44
@delvh
Copy link
Member

delvh commented Apr 11, 2023

🎺 🤖

@delvh delvh merged commit 890d10c into go-gitea:main Apr 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 11, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 11, 2023
In the `for` loop, the value of `membershipsToAdd[org]` and
`membershipsToRemove[org]` is a slice that should be appended instead of
overwritten.
Due to the current overwrite, the LDAP group sync only matches the last
group at the moment.

## Example reproduction
- an LDAP user is both a member of
`cn=admin_staff,ou=people,dc=planetexpress,dc=com` and
`cn=ship_crew,ou=people,dc=planetexpress,dc=com`.
- configuration of `Map LDAP groups to Organization teams ` in
`Authentication Sources`:
```json
{
    "cn=admin_staff,ou=people,dc=planetexpress,dc=com":{
        "test_organization":[
            "admin_staff",
            "test_add"
        ]
    },
    "cn=ship_crew,ou=people,dc=planetexpress,dc=com":{
        "test_organization":[
            "ship_crew"
        ]
}
```
- start `Synchronize external user data` task in the `Dashboard`.
- the user was only added for the team `test_organization.ship_crew`
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 11, 2023
@wxiaoguang wxiaoguang deleted the bugfix/resolve_mapped_memberships branch April 12, 2023 02:41
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 12, 2023
* upstream/main:
  Add popup to hashed comments/pull requests/issues in file editing/adding preview tab (go-gitea#24040)
  Use reactive store to share data between components (go-gitea#23996)
  [skip ci] Updated translations via Crowdin
  Fix accidental overwriting of LDAP team memberships (go-gitea#24050)
  Add cardtype to org/user level project on creation, edit and view (go-gitea#24043)
  Fix branch protection priority (go-gitea#24045)
  Update documentation to explain which projects allow Gitea to host static pages (go-gitea#23993)
  Fix date  display bug (go-gitea#24047)
  Fine tune markdown editor toolbar (go-gitea#24046)
  Add tooltips for MD editor buttons and add `muted` class for buttons (go-gitea#23896)
  Prefer native parser for SSH public key parsing (go-gitea#23798)
delvh pushed a commit that referenced this pull request Apr 12, 2023
Backport #24050 by @sillyguodong

In the `for` loop, the value of `membershipsToAdd[org]` and
`membershipsToRemove[org]` is a slice that should be appended instead of
overwritten.
Due to the current overwrite, the LDAP group sync only matches the last
group at the moment.

## Example reproduction
- an LDAP user is both a member of
`cn=admin_staff,ou=people,dc=planetexpress,dc=com` and
`cn=ship_crew,ou=people,dc=planetexpress,dc=com`.
- configuration of `Map LDAP groups to Organization teams ` in
`Authentication Sources`:
```json
{
    "cn=admin_staff,ou=people,dc=planetexpress,dc=com":{
        "test_organization":[
            "admin_staff",
            "test_add"
        ]
    },
    "cn=ship_crew,ou=people,dc=planetexpress,dc=com":{
        "test_organization":[
            "ship_crew"
        ]
}
```
- start `Synchronize external user data` task in the `Dashboard`.
- the user was only added for the team `test_organization.ship_crew`

Co-authored-by: sillyguodong <33891828+sillyguodong@users.noreply.github.com>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants